cleanup
Updated diagram