Update new design by Manu