tweaked for deployment