Factory finally working