Added modular system with improvements!