rework part of configure mechanism