ModJam commit#7