updated dependencies and adapted