Merged Updates

updates