new check unit methond, minor refactor