add safe mobility, update to v0.36c+