merging everything together
merging v2