Adding diagram and moving things around