Update for MRW work