modules reconfigured + added original