Improved Round diagram behaviour
Minified