edits for more reliable cross-library intregration.