Added code for AUTO
Added code for AUTO
Added code
Fixed conflicts with code