changes from linux test