s7 added the changes kim asked for histry plots etc.