Added some changes to UNIX side