Changes to hopefully keep it save compatible for a little while. It works, but has yet to be stress tested.