lattest updates from eric *Fixed Merge Issue