did some stuff to try to get things to work right