data model redesign
pie strategy fix