[UPDATE] additional checks.