changed types and added data