Changed the toString methods