Extensive changes all over