Few changes in main automation