readd missing checks