Added stuff from Linux box