change after James gives me suggestions