added upstream changes to Mojos