added auto support