added manual checks