simplify calls and return true missing added