changed mobility weight, refactored a bit