Sega. Commit to merge with Erik code