Initial update mechanism working