made more changes to challenge2