Fixed first two shift times
Revert "Fixed first two shift times"

This reverts commit 3add595bec1aba74b46730de724a31ffc9b4edce.