Resolved task 6 & 7.

Please merge my task