Use additional checks