Better hendling of updates and some localization