sorta big update

I hate this