Another tweak; cleaned up