Finished Assignment, just fine tuning