Completed implementation of override