All fix

Added Tim's and Joes code to github REFIXED the drag issue