Updated to properly use class variables