Changed to use previous fonts