adding CHECK_ALL back in