Major updates to assignment