added support for sub shifts