Trying to handle current direction in a better way