Making some properties atomic