shifter changes
merge