Redid Hack for issue #2 because it never was implemented live.