Changed back to seperate change and force animation model.