upgrade some versions and requirements refactor