updated api
merged changes