Minor change and Bror Jonsson feature.