Added override mode