upgraded version and local changes