Re-did most of autonomous