Second tentative
Current tentative

Still to be throughly tested and adjusted.