adding a few changes