Added filtering. Up to page 171