Fixed Question2 code