Moving towards the modular version