Opened #2 for further discussing. Can you remove this change this time please?