Added some shifting stuff