Stability updates, split some functionality into new variables