Continue working on plotting