first little modify for myself@!