now it really works
fixed merge conflicts