Added more code towards Filtering #38