Updated for deployment