Resolved Conflicts
Update Files with Kasun's Changes