infrastructure improvements

1 2 3