Added more code for autonomous