Made some adjustments to the soft shot function
Merge origin/master