refactor, and new feature.
some pictures we don't need.