update - side comments!!