more module changes done