changes still in progress