Puerto Rico

patches from

Puerto Rico