Changed making of L2 points - core variables can be from different parts