Added requested changes + added a few more changes

1 file changed