Changed to use new un-deprecated method
Added override method