crashing...
more fixes