Now uses public variables rather than accessor functions