Xaiki/factor filter

kill some codez wiiiii \o/