changes until firebase denormalization