some changes I made, but didn't get added