prior commit committed some premature code, this is the rest of the commit