some more require -> import changes