combined changes 1