Updated for assignments