changed override logic