Wow, I didn't plan to do this much tweaking...