Bad case of refactoring... Ouch.
Hopefully fixing the CME this time.