added task 3, commented on task 2