Add updated version from @kutluk