Better weight handling and optimised weight parameters.