updated to current dependencies and settings