Updates to version 21