Milestone-2 code changes + Copyright comments included