week7 done with some bug