Improved Hostname (no more need to have -1)