Submitted changes so that they can be cloned for Linux desktop