added some new checks