Merged with diagram branch