integrate changes made on linuxbox