Updated this project to 2021 standard