major changes in all modules