changes that hopefully don't break anything