still more stupid changes