Updated for artbollocks-mode