added some @Override annotations