little modify..