some mojo changes