Simulator wandering seems to work reasonably well now