integrate some improvements from work comp