New diagram and some tweaking.