updated dependencies
split code