AGV changes

Finally, fixed.