More portable (part of a bigger possible change)