Modifications to WRTBWMon Solution