Added RCWs, added more filter control.