Added a few changes and slight modifications