added filtering. Methods are getting too complex