added two-player validation, changed association