Ensuring the properties are updating on the right triggers