Was working until I fix sigma and drag

Debugging...