autonomous 3 changes

code:rohan
code review: tyler and j-money