24/04/2020 - Improvements