continued work on race implementation