change some stuff to make it nicer