Changed to using properties.