Automation of the whole process
Minor tweaks