Commit for answer 2 and 3