Extra credit Code with updated specification requirements