Issue #26: comment + extra conditional based on feedback