making things slightly more modular