extension improved, hostname removed