finish challenge3 and tweak 2