Minor changes after discussion with Elias