Sib/design improvements