SEP-6 Add comments