merged fmwl and rhjm
merged fmwl and rhjm