Added properties. Did suggested changes.