Updated for future opportunities
merged