Further power spec figure handling code