Design updated (TS 0.9.7)