Got rid of Turn and simplified validation