added a few changes