Updated for Windows stability