Working on improving portability