Changed factory again, now it's awesome