Added all checks