done tasks 1 and 2