Updated with respect to Linux