refactored
updated dependencies