Updated for graphics