a few changes made