updated ver2, no preview