slight changes for size optimization