new properties + bug fixed