added missing properties, tested