adding in the rest of chanes I forgot to add to previous commit