updated for latest Mojito RS