Improved firebase data structure, fixed totalDrawn counter