Added X-O functionality