Changes after testing under Win