added filters
removed debugging code