Took out struct