Adapted code to new version of API, works for now, need more tests