fixed design and added clear race