upped version for merge with dnb no scale branch