1kg improvements

Change-Id: I1ba1ba7727aae3bdc93d3eb740cc4560300cda68