changes to make it not be super slow