Nit, can you move this above the virtual getters? (to line 96)