plus haters small
fixed merge