added some features..