Finished #3759

Finished the great start by @BourotBenjamin in #3759