update for struct-member functions