Added autonomous selector