Making initial changes for Build 4

Build 4 changes are added here