Added momentum filtering