revisions for optimize, reorganization for data