Added Race checking