HW parts; layout changes