Update to not have bugs