New diagram and minor touches