Merging work with Edwin