upgraded jade and mocha