added some functioality