all directions
fixed merge conflicts