made a few changes