added notnulls