Okay, I think I've been able to do this a little more cleanly.