Performance improvements

2021

2020