fixed my horrible merge from earlier