New script v21 + minor model change