More of Neils changes + input from Jan.