added stricter checks
changes