done 7h
7h clean up