Fixes. New diagram (yay!)