Changed from session to class variables to persist values accross sessions