Xaiki/factor filter

kill some codeZ !!!