Updated for start of class