Finally (hopefully) fixed the goStraight method