Some mahor changes