added mojihame and improved