move to a more configurable approach