More set up for autonomous modes