Changes after Fredrik's review