Updated to rules 2020