Updated Print functionality