added some more features