includes changes for problems 1 and 2