still fixing & aligning module fn names