Changed back to struct.