Updated mustache