move towards filtering and add comments.