Minor improvement, that this probably should be its own property setting.