added more checks
fix missing,