Believe it or not, this /is/ an improvement! =D