some changes
fixed merge conflicts
I've lost it,
wtf