Working on missing checks logic