Colour changes and another attempted fix to the race condition