switched to a modular format