commit #19.1 - {A bit more organised}