- added some functionality