First batch of major modifications.