added all checks