Added s20 and s21