modified for deployment