Imported new shot math. Almost there...