challenge2 a little bit modification