changes to both