Added support for two shifts