Modify return values
Add q2 for assignment 1