Added filtering on a couple points