adjusted some versions