2017 & 2018 Improvements