about to make some struct changes