Cleaned up for Weekly Submission ( IAD wk2 )