slight changes for better portability