implemented a few changes