merged twan's drake joint pull request