Fixed and upgraded Warp filter