Ok. Do you prefer the current implementation? (regardless of requiring work to change it :).