Added autonomous mode