#178 change animatable index

Animatable index handling ready to be reviewed