Add some shift and comments