Updated with completed assignment