Fixed Partly
Fixed another part