next attempt at properly dealing with mvars