next-gen enhancements