Completed sprint 1 code fix