Final Changes, All working (No Comments)