Merging with eddie branch