Cleaned up autonomous code...