added some automation