some struct changes