Made stateful more consistent with grading requirements