minimal changes for default mode