eliminated all null warnings