added some more features.