Development/menhir: Upgraded