upgrading plot quality and structure - v07