Added x and o