update with the override logic