better method name and params
Merge branch 'master' into messed_up_fights