minor changes to 20/21