implemented QA points from Steve