Added tomora 2 and simpler tomora 1.