Updated to reflect the start of class