further adjusted defaults