Overhaul - moved away from complete automation