Rewrote serialisation