Added back all checks