added changes from last commit that were left out