Completed

Project for msmile -- 2