Code design followup