Revert "optimize"

This reverts commit 4aac3bf6f0d385f13eda8ccafe64571c8aa27f16
orientation
version2