Updates per moritz's comments