Code changes, working on plotting