modulization done for RWM