Eliminated most of the hacks.