Nice PR for the class!