moved checks into module class