adjustments for @camilleghirne new design