Solving figure issues 2

Solving figure issues 2