junk change
merged with latest fuerte adaptations