few changes made!