Feature/38 change in direction