keep up with Classic changes