Merged with GMM control