Adding Autonomous mode + minor changes