Auto Mode update- cut out bad stuff