added more safetycheck