update and add more, v1.6 dynamic