Added better printer functionality