some changes in Mojito