upgraded and fixed modules