Updated for current usage and hinted at future