manual jar stuff double sucks
fixed merge conflicts