got rid of ugly hacks