Encapsulated the snapping; tweaked window filter again