Various changes after lots of runs
more runs