Started adding a bit more automation