mergd proposal changes, fixd diagram