complete restructure, specilly the plots