Working nicely, now working on plots