commit 18-12 : 10h45