Update to be safe, still WIP