update olivier's design