Win options weren't necessary
More optimization