Quit guessing on direction, do this instead