Rework in progress...
Merged progress on new plots