Worked on the optimist overrides