Updated for windows paths