changed some versions, refactoring