working on merging...