Merging Marina and Master