I should convert this to an observable property