Updates based on input from Oskar.