shifter working with some comment changes