last updates from chino repo