Changed calling properties from _ to self. for consistency