Rearchitected with mustache