Complete overhaul by EudGenius.