put in some extra conditions