A few changes based on Andreas review