Added changes that were made on other branch.