MOGA-Sam-and-Diana-Updated