removed shift state from player
merged in and prettified