feature/review Factory and State Changes