using a struct now, it works
works but need to remove animations too
works great