Add more to figures code