added mod & not checks