adding changes I thought I added earlier. Stupid git tracking