Cleaned up override logic.