Updates to streamline code.  In progress