Merge with Francesco updates