uniform improvement

1379