This update should work completely