Refactor
Buggy reconfigure