changes made in the correct places