First commit taken from uodate folder