Left/Right added+refactoring up/down