experiment to do 2d scan
day to day experimental changes
merge from latest master