Improving Core Code