Changed a few things to not be overridden