Working on shape plot modularity