Completed transitioning from doubleshot to mocha