Following awaxman's advice for deployment