added some more useful features