Good catch. this applies to all changes below.