Figure updates and remove ref 20
with previous commit