Other proposed changes for #51