very very ad-hoc and dirty speed up