it's piece, not figure - cleanup part2