updated api
merge fix