mixups after Carlos’s merge into my branch