Total rework on racing app