Some Adds and Changes