Improved autonomous code