Others design improvements