@andreasohlund review new version