some changes so josh can test w/e he is working on