Fixed logic and recording / color changes etc