This function doesn't seem to be called. Is it needed?