Second Commit

Modified a few things