This version probably needs to go into the bento fix. @cournape I pinged you about these additions twice before, but I probably was not specific enough about the problem.