messing with wandering, still not right, but better