removed names. also renamed some properties to make more sense