Sigh... More tweaking...