Jeremy Newman : update with latest defaults