some optimilatations, added more filters