slight changes for compatibility