Forgot ben helm's changes to make it work with coder and BT