updates and match local version with development