Updated to latest v1