small changes for external use