Improve the hack