added some feature