Updated override define based on feedback from karolherbst