fixed based on prof suggestions, 1/2