Updated for design