More work on plotting