Design imrpovements