more changes to address previous issues