Rewrite the 'shift' option and fix the bug on 'ishaaTime' method