added 3 new properties
merged changes