Updated printing functions