Profile changes and refactoring 

Explanation about what's happening here?