Updated for new base