Updated with latest from windows machine