bundled for deployment
fixed botched merge conflict