added 2 factorys and more