Adding challenge 2 and tweaks