now with support for cm_mako