Yet another overhaul...