Treatment table reimplemented
More info saving implemented