Changes according to Johannes' comments