task 7 + formatting done