Update default values with Georges feedback