Changes for external use