Added tiny code pieces, all good, only need to resolve fqdn issue