Updated for Assignment