please move this to rest of the properties