Branch: Minor changes, Add all of the changes