Updates for M3

Signed-off-by: Paul Withers <paulswithers@hotmail.co.uk>