Modifying to work with mucalc_constants