Improvments on Automation