Integrate Antoine's design