Trying to preven the need for a merge between amazon and local branch.