Updated to latest tanuki service