Final Update - Step 5-6-7-8