Updated for new assignment