removed daft measurement hacks