Update class variable notation
Final implementation - lag to death