Change way we do override