did some changes regarding Nils' corrections