Updated load save functions and added TC