milestone-2 code changes + copyright commnets included