Updated for latest assignments