Worked out new override logic