updated consolidate and mustache