Changed the source/shocks order in the method signature and used places.
#newsmute-60 In Progress