updates to work for v3.x