overhaul and simplification for a start to deploy