Added better printing