Updated for latex