some changes I forgot what's the fuck