Tweaked for windows configuration