merge fix
Harry -- text changes