tightened up requirement for default data