some changes i left uncommited like two months ago. i forgot what i was doing