changed data types to properties, removed id