improved performance about preview