Non ATOMIC update. Getting closer though.. Lots of things ..