Added overrides and a display off option