solved 2 challenges