Moved modifications to override