Added windows functionality