Third Commit to add some more functionality