Now with fewer hacks