fix some thing broke other try this part c out.