added some small changes