improved portability for future updates