Filter Working on Hex & Pins

Need fine tune to update