Topic/reqs 333

or should this have an @Override annotation?