Some Major changes