Added windows stuff