correctly export/unexport methods mentioned in previous commits