adding changes that didn't make it on the previous commit
fixed merge conflicts