changes according to jukka's notes