Updated work for task #12

I have done rest work of task#12.