Help: review and update to 3.11