Progress on modular version