Better syntax. Added more properties.