Added Saver and Table format
fixed merge conflicts