not sure what happened when I tried to merge in the version control but it's fixed, i think