fixed and finished task1