Made canned equations work