Step 8 completed & Some bugs fixed