sync with latest libs and update syntax