Add more to the 2. part of assignment 2