made stuff more modular