Fixed diagram some more