Completed assignment
Updated format