changes made by Olof