re-work to use configuration to support quick re-use