Changes made by Jens.