Some adjusts made