Add @Override to improved implementation