Main changes in code.