removed conditional since its in the class now