Hacks from 1.0