commit 12h21 resto & shop