Added shiftround
Removed amir