Changes from last class