some checks reworked