restructuring
fix
fix day chart