worked on merging with emver