added more default re-checks