Let's hope this is the last time I have to touch this code ... otherwise I'm pulling my hair out. :-)