Changed weight calculation. Removed RM.
Minor changes.