Rewrote task 06