Changes from class feedback