merging some of changes that didn't merge for some reason