Various changes, works apart from 'Shift'