Ran Source.Format
updated data encapsulation and ran Source.Format