updated for shima__shima