Changed for development on windows