structure update, also updated setup args