some changes I made locally