Improvements on Mojito