Rework code once more :P