restructured, data/content encoding added