More work on Final Race