CLSN-2020 : fixed, token & operators