Updated overrides

*Minified lines of code