commit 26-5-11:58 nico