Improving the hack...