Added @override annotations were appropriate and needed